From 8c82c23f5241971c5283476f71656ec979865bd5 Mon Sep 17 00:00:00 2001
From: Iceyer <me@iceyer.net>
Date: Fri, 28 Jul 2017 11:33:07 +0800
Subject: [PATCH] Remove conflicts

Change-Id: I790d41822d4741c71295acbf04db73616bd3dc8b
---
 debian/control                | 1 -
 debian/libdtkcore-dev.install | 1 -
 2 files changed, 2 deletions(-)

diff --git a/debian/control b/debian/control
index 581718c..ea2e469 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Standards-Version: 3.9.6
 Package: libdtkcore1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libdtkbase, libdtkutil, libdtksettings, libdtkcore
 Multi-Arch: same
 Description: Deepin Tool Kit Core library
  DtkCore is base library of Deepin Qt/C++ applications.
diff --git a/debian/libdtkcore-dev.install b/debian/libdtkcore-dev.install
index c42bad4..682da5c 100644
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@ -1,4 +1,3 @@
 usr/lib/*/lib*.so
 usr/include
 usr/lib/*/pkgconfig/*.pc
-usr/bin/dtk-settings-tool
-- 
2.30.2